resolve master and develop conflict #1122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PeterRao
added a commit
that referenced
this pull request
Sep 4, 2023
* chore: adjust download request hints (#1061) * chore: adjust download hints * chore: adjust download hints * chore: some optimized (#1062) - add head method warning - adjust PR githubCi * chore(develop): remove cleanbucket workflow (#1094) * feat(develop): ios dingding add default content-type (#1070) * feat(develop): ios dingding add default content-type * feat(develop): ios dingding add default content-type * feat(develop): ios dingding add default content-type * feat(develop): ios dingding add default content-type * feat(develop): ios dingding add default content-type * feat(develop): ios dingding add default content-type * chore: remove remove redundant judgments * resolve master and develop conflict (#1122) Co-authored-by: xt01102058 <xt01102058@alibaba-inc.com> * resolve master and develop conflict * chore: marge develop to master * test: fix test ConnectionTimeoutError bug * chore: add put() timeout unit * chore: optimize the translation of readme.md ResponseTimeoutError --------- Co-authored-by: moca_tao7 <moca_tao7@foxmail.com> Co-authored-by: xt01102058 <xt01102058@alibaba-inc.com> Co-authored-by: PeterRao <peizerao@gmail.com> Co-authored-by: csg01123119 <csg01123119@alibaba-inc.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.